Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 03:39:50 +0000 (20:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 03:39:50 +0000 (20:39 -0700)
commit95ea21c1a442bc295e4ec88c2e9b94e3cabbd704
tree114a5bb61ff168efd3edf64d4d414fd2c341d0ea
parentc7f49e9ec82ec9b2f4d3e83aca64decf4a0f0da9
parent119182f9785902b0a150a3560cd5bf330bb51015
Merge from trunk.
src/ChangeLog